Merge "QuickSettings - fail gracefully if we can't query the profile data" into jb-mr1-dev