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

Change-Id: Id50450f4606020f053c0d94663fdd47dc0a337b8