Merge "Fixed layout of quick_settings_header_info" into qt-dev