Merge "Prevent workspace enter animation for predictive back" into tm-qpr-dev