Fix after theme chooser

Change-Id: I5e7ad444435d586fd9a5c711084424208b0edeea
Signed-off-by: iceandfire <arhamjamal@gmail.com>
Signed-off-by: Arnav Gosain <nolinuxnoparty@gmail.com>
Merge "Fix after theme chooser" into 4.4