Merge "Also invoke "setProgressTrackerIcon" when mTrackerIcon is null." into main