Merge "Render invocation lights as beziers, not circles" into qt-dev am: 18fff17455
am: 6d8473edf8

Change-Id: I8885885466e5ed930a7bd24aa34a120504dab519