Revert "Postpone color mode change until after boot animation" am: 2924d01304 am: e6f4f12a92
am: 5a5297d37b

Change-Id: I30c99ef32abeff19afef441edb5313059059187e