Merge "sf: avoid lock on main thread during luma calc" into qt-dev
am: ad4019431f

Change-Id: I97e70374c2ed8f114ddd82ff6cba747cf83be715