Merge "Correct contextual button width, height and touch area" into main