Merge "Restore the taskAffinity behavior of singleInstance Activity" into main