Merge "Fix bubble bar stash delay" into main