Merge "Clean up protected apps code (1/2)" into cm-11.0
(cherry picked from commit 55862f101fda7df86228a727547bb73f80e9a04c)
Merge "Settings: Don't match action bar parent for search on tablets." into cm-11.0
(cherry picked from commit 7eb8050ef1ac22d6e7fe1f7ca21eb5513ed8aa70)