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