Improve selection for background objects and tidy ControllerState layer handling