Merge "Clean up ex-users in lock settings db" into nyc-dev