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

Change-Id: Ic0cd2c51cde2e40f704ce48b8d347d20be465ccf