Merge "WM: Guard against released surfaces in forced rotator"