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

Change-Id: I39765550b391eafc994411ca90e2ec39ff7d7cec