Merge "Hide the stop button for the device admin app in the task manager" into tm-dev