Merge "Restore config of associated window when clearing fixed rotation" into rvc-dev am: 766aa3a1 am: b9cef88a Change-Id: Ic3cc14d6a81be44160a837c3d7786c8815a9408b