Merge "Force re-render header on update" into ub-gmail-ur14-dev