Merge "Check bubble count for initial state animation" into main