Merge "Change margin to padding in quick_qs_status_icons" into qt-dev