Merge "Widget Picker - show app icon next to recommended app label." into main