Merge "Merge "Don't animate black background on cold launch from launcher"...
Merge "Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev am: cff260ad am: e4a47023" into oc-mr1-dev-plus-aosp
am: de6b046a
Change-Id: I439012dc00cb044ac57677f0b59e22413959e039