Merge "Settings: Use solid actionbar" into cm-11.0
Merge "Forward port Status Bar settings (2/2)" into cm-11.0