Merge "Fix light center position for layers"