Merge "Fixing various QS issues. (Bug 7216908, Bug 7217154)" into jb-mr1-dev