Merge "Fix the missing spot shadow when DEBUG_SHADOW is turned on"