Merge "Work profile without password shouldn't be locked." into pi-dev