Merge "Using inline definition of FrameDrawingCallback instead of lambda as it fails on some devices" into rvc-dev