Merge "Confine the quick settings trigger to the right third of the status bar." into jb-mr1-dev