Merge "[2/n] Avoid flicker to drop a widget that needs a config activity" into main