Merge "Fix SysUI / AoD leaking content observers" into qt-dev am: b755a7c16b
am: 0c34b102ff

Change-Id: Ieb522b1c2849f3d6a6b1724299a340089e87fedb