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

Change-Id: I5de4cae89095804c774f0497b1c754311a2b3551