Merge "Fix window visibility during layout" into oc-mr1-dev
am: 7a59a62276

Change-Id: Ic4726a77ce790616d50ff84edc35e7941b409659