Merge "Adding a timeout for active-unlock" into tm-dev