Merge "Fix SysUI crash when memory collection times out" into tm-qpr-dev