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

Change-Id: I3046b09b85a995491e616736cb9519c7ced3a944