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

Change-Id: I2037539c61a202a017c7b9ca2182bfffd79eaafe