Merge "Add owners for locksettings related files"