Merge "Revert "Ensure GRANTED_BY_DEFAULT properly cleared in NMS"" into main