Merge "Fix regression in startBugreport flow"