Merge "Fixing various QS issues. (Bug 7217102)" into jb-mr1-dev