Merge "Using internal user manager for the lock state checking" into sc-dev