Merge "QS: Don't use ComponentName to identify tiles" into nyc-mr1-dev