Merge "Fix inconsistency in reporting device admin active state." into klp-dev