Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev am: 2f35f15ab0
am: 87f68c849f

Change-Id: I70b6b8ca3e61d53de0d03df914295ed655b12755