Merge "Fix win mode issues for unresizable apps" into tm-qpr-dev