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

Change-Id: Icf927506ab83ac03c754658625520eca4cd1b529