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