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