Merge "Replace icon for merge commit" into stable-2.9