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

Change-Id: I94b462f38ead5fb7e2253604ad4437c7a5670e4c