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

Change-Id: I61d5cdf72fc61423c433644dcf2fe9d0a2a3be67