Merge "Fix the device admin apps status not refreshed" into tm-dev