Merge "Adds setCornerRadius to ActivityView & SurfaceView" into qt-dev am: b46293f8f6 am: 8cce984f02
am: fb9e35db21

Change-Id: I5aef359ab9817be0fecaafe42dfb1b26b8342477