Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev