Merge "Reduce paddings on 320dp screens, we don't have much space" into oc-mr1-dev
am: 04094078be

Change-Id: I9e538baa5f0e1f17860c6568fd4ed1af21c59387