Set new defaults for tablets and phones

Change-Id: Ibde779ea20fa9a83618bb6dbadac6a51905f8c98