Merge "Ensure the correct animation bounds for STACK_CLIP_BEFORE"