Merge "Remove TODO for per display implementation of Bubbles" into main