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

Change-Id: I8438349895a35591bd51610c0d8c9d5d14296d8f