Merge "QS Edit: Fix auto-selecting add location" into nyc-dev