Merge "Restrict hotspot qs tile to admin user" into nyc-dev