Merge "Catch an exception when loading a bubble icon" into main