Merge "QS API: Fix mService and mTile being null once and for all" into nyc-dev