Merge "Remove gentle/alerting icons from channel settings" into qt-dev am: 535f0489c9
am: 81141a5918
am: 7bb5801f29
Change-Id: Ia5a113cb66a855357c57f1015afef8abb57867c0
This commit is contained in: