Merge "Fixing black background when going back from assistant." into oc-dr1-dev
am: 4d6747bb0f

Change-Id: I93373af41ad59ce2a5f3e82e07027286138b8c10