Merge "Fixed a bug where the header was positioned wrong" into nyc-mr1-dev