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

Change-Id: I505f07bca9b1f8bf80c75abe2cf2f10248b8b9b1