Merge "Adds setCornerRadius to ActivityView & SurfaceView" into qt-dev