Merge "Move config-at-end seamless-flip to activity-level" into main