Merge "QS Tiles: Fix some problems with connecting through intent" into nyc-dev