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

Change-Id: I27d95bce8a46412d97389cc9072cac1dd9af69b2