Merge "Fix home button size" into oc-mr1-dev
am: e27dab87ed

Change-Id: I827bba9c6f17728fe605066de925484fc04276b5