Merge "Revert "Frameworks:  Allow Custom Icon Tinting Option (1/2)"" into jb-mr1
Merge "QuietHours: Change Logic (2/2)" into jb-mr1