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