Merge "Don't show ringer status if dnd overrides it" into pi-dev