Merge "Fix difference in icon size for quick QS" into nyc-dev