Merge "Dump some bubble data to dumpsys" into main