Merge "Set config_dialogCornerRadius to square icon shape" into qt-dev am: b1e562de98
am: 71079d97fd

Change-Id: I5f82a1701fb8ed464075f3196838d85e398474e9