Merge "Fix the height of tap targets for undo." into jb-ub-mail