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

Change-Id: I1c14899daa358eb03f7ad07eaa9987acdf31e83d