Merge "Proper handle of duplicated BUGREPORT_STARTED." into nyc-dev