Merge "Fix freeform window can't resize after maximize window and restore" into rvc-dev am: 05e4028d77

Change-Id: I90fef26ee300d2f727ba154faf17b6c5b6edd6a0