Fix task behavior for ThemeChooser [3/3]

Change-Id: I3608d06521b650d40df1d32f6d2cce1376830a58
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0