Merge "Removing unnecessary iconFactory class when generating badged icon" into main