Merge "Initial changes to add QuickSettings." into jb-mr1-dev