Revert "Postpone color mode change until after boot animation" am: 2924d01304 am: 53bb4e138c
am: 1c901cdd7a

Change-Id: I13001e6be0f197db6105a1b7f397865699411288