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

Change-Id: I05322d349c5cc0862307ac7040745a866b49e209