Merge "Only apply rounded-corner animation on TYPE_BUILT_IN displays" into qt-dev