Merge "Update string for dwell click timing" into pi-dev