Merge "Temp fix to split header and position count behaviour for watches." into nyc-mr1-dev