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

Change-Id: I686af6514b46b127e34154186f7ae06133dd58c9