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

Change-Id: Iac825bf2f52b3bff59b522b57a71e30af1de2bd9