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

Change-Id: If182308e0602e3e5af0998698f0e428f7c3ff18d