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