Merge "WindowManager: Take care with Surface lifetime during relayout to invisible." into oc-dev
am: b8bb3f7137

Change-Id: Iceb64847b920939ac2ddfd49e3d7e8b35e5f6a4f