Merge "Polish velocity for cross-activity-back with 3-button-nav" into main