Merge "Set parent on animation-background before building" into main