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

Change-Id: I451b9fae2781d45bc6b5216f3af32655ac6262db