Merge "Trebuchet Settings UI Refresh" into cm-11.0