Merge "Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev am: cff260adfc am: e4a4702356" into oc-mr1-dev-plus-aosp