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

* commit '45167ac5cd04eb055b288707f863f33725bb11ff':
  Fixing issue where qsb was not translated back into position when going home from an app. (Bug 6486197)