Merge "Fix admin check in Settings."