Merge "Postpone color mode change until after boot animation am: c53d3558d5 am: 18b6b78ecc" into oc-mr1-dev-plus-aosp am: 072c502ccb am: 5f74f3613c
am: 7f01bcf2ea

Change-Id: I2b5805e8eeba8582420a5f557831680c83277a0e