Revert "CM11 Themes: Delay setting default theme"

This reverts commit 0ea61ffe45d167f67045f16f6bf8581cc1d333f3.

Change-Id: I13fe41ebc5c11379c64d4d4573f0e914ee57d799