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

Change-Id: I48560bd983b105d2b37e813d1c3f9fd8bebf006d