Merge "Use ActivityService from lock screen" into tm-dev