Merge "Only support manual stashing while in app" into tm-qpr-dev