Merge "fix position go backward after resume"
am: 334e5dff47

Change-Id: I500ca24ad48c9b7d54de3ec79ba98ee202bad436