Merge "Launch app intent after unlock" into tm-dev