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

Change-Id: I5afc68f072e818ca09e33ea1157a7558d1414a9d