Merge "Disable the camera and search buttons while we're in bouncer mode." into klp-dev