Merge "Move bubble icon / content loading into its own controller class" into main