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

Change-Id: I00cc594c30dd2bc8e55531bfc8c90c03929b8dfa