Merge "Clear icons for app/ime keyboard shortcuts in shortcut helper." into main