Merge "Fix SysUI / AoD leaking content observers" into qt-dev am: b755a7c16b am: 81d2b732e2
am: ba5285bed5

Change-Id: I5d8bb6dea1a6bdd09aeb3a50e9b4b67a4f83e3ef