am d5a5672c: am bce7055a: am dfe1e170: am 37de3993: am 55b00376: Merge "Fix the undo line colors" into ub-gmail-ur14-dev

* commit 'd5a5672c7ed9fed7ec7b8dec16736114d8ae0b72':
  Fix the undo line colors