Merge "Settings: Add missing up navigation in menus" into cm-11.0
Conflicts:
	AndroidManifest.xml