Merge "Fixing issue where qsb was not translated back into position when going home from an app. (Bug 6486197)" into jb-dev