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

Change-Id: I929ceb71bdc6f746553749a2e173520a52495d02