Merge "Properly expose LockTypes constants as systemAPIs" into sc-dev