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

Change-Id: Idf780887c3576097eaf857bf735a5f810ea177d8