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

Change-Id: Iad8a5b4524d70801eeb7b4abb14626b3ae127e32