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

Change-Id: I070ed03a1c51f5bad316f53645105cc55b867262