Merge "Have bubble bar unstash gesture track finger" into main