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

Change-Id: I6dc64b7ba25c7742828d08c4f861de494dee0f82