Merge "Keeping the header hidden while the hun is going away" into pi-dev am: 2cfd9fb99c
am: cb4e490d99

Change-Id: I0c2780d928c6bbe52a664655f5cc1f3750f19b2c