Merge "Fix that window was not hidden after policy hiding animation"