Merge "Fix predictive cross activity back corner radius flash in split screen" into main