Merge "QuietHours: Change Logic (1/2)" into jb-mr1