Merge "Populate iconResId in ModesTileModel if it's know to be a system icon" into main