Fix task behavior for ThemeChooser [3/3]

Change-Id: I3608d06521b650d40df1d32f6d2cce1376830a58
(cherry picked from commit 1a0b6e0e872e1720e4be8ded97bbed4cd72dd1bb)