Merge "Add locking to performance hint NDK" into main