Merge "Remove heldMotionless disabling native scroll mode" into jb-dev