Merge "Add metrics for waiting dexopt" into main