Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev