Maximize Restore for Window #3400

Change-Id: I164ae83bd6cf98f7a3d7e76d8e717a56e8cb5183