Merge "Avoid flicker to drop a widget that needs a config activity." into main