Merge "fix position go backward after resume"