Merge "Fix a bug with showing the widget picker on edit activity launch." into main