Merge "Correct button measuring" into pi-dev am: 7557234316
am: e5f71abd69

Change-Id: I68a9bac9623581108d3ed2a3e1e0f197c1366aaf