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

Change-Id: I95cc1a3842ae79d38c7f5905809313b6c7b81183