Merge "Run onPrimaryMetadataOrStateChange on main thread" into main