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