[automerger skipped] Merge "WM: Guard against released surfaces in forced rotator" am: c1a15b81ac
am: b6afff08e0  -s ours

Change-Id: I33d4da634b74dd4f65b24cd5a1646c73c60d16f6