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

Change-Id: Ie360f3af438f0c1b58620048258d7ba666363744