Merge "Clean up protected apps code (1/2)" into cm-11.0
Merge "Settings: Don't match action bar parent for search on tablets." into cm-11.0
Merge "Settings: Follow quick launch shortcut renames" into cm-11.0