Merge "Don't apply rounded-corner animation on non-default display" into qt-dev