Merge "Track persistent nested Y offset for fling velocity" into lmp-dev