Merge "Restore config of associated window when clearing fixed rotation" into rvc-dev am: 766aa3a107

Change-Id: I7fe616ca131db89393b8f3a3c21bf794c003bbc3