Merge "Remove unnecessary shadow damage calc in invalidate"