In Security Shuffle, White House Merges Staffs