Merge "Long pressing on UMO should not show configure widget button" into main