Merge \\"Fixed the heads up disspearing bug for real\\" into nyc-mr1-dev am: 70b06cc62f
am: 58526c8391

Change-Id: I4d60c9ee527228541d393f725854081ac13f3c91