am 3e50ec93: Merge "Force re-render header on update" into ub-gmail-ur14-dev

* commit '3e50ec93f0b75503a800207f2c8911310e0707c2':
  Force re-render header on update