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

Change-Id: I9c5d5b993a5d4b3bff97ad15cecc84bb5a567572