Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev