Merge "Fix screen freeze when changing display size in Multi-Window mode"