Merge "Set channel dialog switches to 48dp height" into qt-dev am: 3e83e8ee65
am: f9b3b8e0e1

Change-Id: I9488e654d0136747bf67f915dacb52e846af417e