Merge "Delete locksettings files for toplevel users only" into lmp-dev