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

* commit '2e6d86c7f99e32e1e8dcaa89e1d5f07b58b4a02f':
  libgui: Prevent segfaulting in abandoned ConsumerBase

Change-Id: Ie4a8ea61e1eca9a997d027e78de63b8fbc9a7f86