Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev