Merge "Merge "Fix SysUI crash when memory collection times out" into tm-qpr-dev am: 884e40d7db am: 8a70bef6cf"