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

Change-Id: If76cb24f722ab33c9c36e799f025fa02c2baf5ce