Merge "[PiP2] Find config-at-end activity in AE case" into main