Merge "Avoid changing resolution by display mode when animating"