Merge "Use down and up event diff for bubble bar click" into main