Merge "Improve the add-device-admin layout." into gingerbread