Merge "Fix bug where rounded corners were being set despite being disabled." into ub-launcher3-qt-dev am: 9da9a2bd21
am: f20a7d252c

Change-Id: I3fcfe4dc137756d5b4a049468632d111ca7fa4f6