CM11 Themes: Delay setting default theme

Change-Id: I56c0ae7a8b6868a1e81b6c7a72c0dd4a079cd7ba
Merge "CM11 Themes: Delay setting default theme" into cm-11.0
Merge remote branch 'cm/cm-11.0' into cm-11.0