Merge "Fix bubble animation when swiping home" into main