Merge "Fix light center position for layers" into qt-dev