Merge "Don't animate black background on cold launch from launcher" into...
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev am: cff260ad am: 4397f033
am: 02de06d4
Change-Id: Ic2bca6e6dff396c39c9f07cb98c6a9e5086cdd43