Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb