Merge "Settings: Specify notification types for QS quick pulldown check (2/2)" into jb4.2

Change-Id: I025c910111f675d7dde570e7d204136f144161f7