Merge "Skip bubble bar arrow animation if arrow detached" into main