Merge "Add support for Predictive Back in WorkLockActivity" into tm-qpr-dev