Merge \"SysUI: Mantain non-weak reference to listener\" into nyc-mr1-dev
am: d4ec5df707

Change-Id: If20be5074d299830e5bd7373fadb1445dd7e5673