Merge "Add Two stages related flags to bug report's flag dump logs." into main