Merge "libgui: New mutex for ConsumerBase frame callbacks" into oc-dev am: fb672ba3 am: 1813e093 am: ba01bec3 Change-Id: I9d45dc2a97af80a3a7625c07a528b3a04bcc7bde