Merge "Fix undo bar padding. b/11307388" into jb-ub-mail-ur11