Merge "Remove additional padding that was needed before when the sensor length from HAL didn't match power button" into main