Merge "Fix clock size tap target height" into main