Merge "Correct button measuring" into pi-dev