Revert "CM11 Themes: Delay setting default theme"

This reverts commit 293d7e8547a05bcb17042402c18849571cd1edcf.

Change-Id: I6fbfdac763c34bdcaa52ee55e4a096267bcd0f8c
Merge "Revert "CM11 Themes: Delay setting default theme"" into pac-4.4