Merge "Fix flicker for Device admin apps." into tm-dev