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

Change-Id: I28b06ecb70ff9ba074e9061d489e998d6b80224c