Fix task behavior for ThemeChooser [2/3]

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