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

* commit 'bd60f01b7744f82f6c2b43f2c6a5eb7734037156':
  Force re-render header on update