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