Android p preview 2
Merge "fix position go backward after resume"