Merge "Suppress ExpandHelper on quick settings." into jb-mr1-dev