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