Some changes to channels based on UX feedback. Test: runtest systemui Change-Id: I1b2f661ba145d6926035f992231dc3c2f8cbf844