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

Change-Id: I9389571ea053ea0f36180a4a71fcd59f8c316246