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