Merge "Use hasBadge instead of isManagedProfile"