Merge "Tweaked the rounded corners when turning off" into qt-dev
am: a29d434006

Change-Id: Ib29a21478def54555f16af85b606835f53245749