Merge "Update bubble bar overflow to have a unique resId" into main