Merge "Making QS scrollable and making numerous tweaks." into jb-mr1-dev