Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev