Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev