Merge "Keeping the header hidden while the hun is going away" into pi-dev