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

Change-Id: I396014ccebf286be1e690c656728015a8541e3e7