Merge "WM: Guard against released surfaces in forced rotator" into pi-dev am: 9352e362d1
am: 3a75c9ec89

Change-Id: I5713af0c6add189454cf44b2d765a2336c006e83