Merge "Update settings after recreating status bar." into cm-11.0