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