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

Change-Id: I37e9eb5ec0e0bdebd85da5b75d42c5cfc306a7df