Merge changes I2af727ed,I0d44d24d into main

* changes:
  Add tests for private profile delayed locking
  Enable stopping user with delayed locking for private profile