Merge "Don't re-lock if we're wake and unlocking." into tm-qpr-dev