Merge "Fix home button size" into oc-mr1-dev