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

Change-Id: Ieac0653f915a892daf11536bda7ae2f9f38eca7f