Merge "Revert "Include SysUI state in stashing check"" into tm-qpr-dev