Merge \\"QS Tiles: Fix some problems with connecting through intent\\" into nyc-dev am: 126088536d
am: a5076ef7fa

Change-Id: I9bb70bc724c36906e014d6f86e48efe37bb42001