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

Change-Id: I82786590e4384ab5ffa51c2f1339161ac06fb9f3