Merge changes Iaf1ee1e6,I861cb65d into nyc-dev

* changes:
  Add TileService settings API
  Add QS long-press -> Settings