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

Change-Id: Ide6894c4dfdc81b19723d945588922335077627b