Merge "Set channel dialog switches to 48dp height" into qt-dev