Merge "Remove @ShellMainThread from CrossTaskBackAnimation" into main