Merge "Allow path specification for rounded corners" into qt-r1-dev am: 3d92c138d5
am: 11aea76fa6

Change-Id: I6b9e5fd62c47dfdd5236f3a3fd6552185a0c20c5