Merge "Add ExternalDisplay metrics logging" into main