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

Change-Id: I14c99a3137f086eca4e1c1ab2f8877ae6df88a4a