Merge "Re-add LockedUserState util that was reverted after TAPL test failures." into tm-qpr-dev