Merge "Clear ZBoost when removing animation leash" into tm-dev