Merge "Fix animation target rule due to split screen arch change" into tm-dev