Merge "libgui: Prevent segfaulting in abandoned ConsumerBase" into nyc-dev
am: 39e4428c81

* commit '39e4428c8196a99bb882ee8c1e16ad697372a9fb':
  libgui: Prevent segfaulting in abandoned ConsumerBase

Change-Id: I59df1d1834beb0c11f957c967aca583a922dfd5f