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

Change-Id: I4f800199c871b862eefd1d813e8ed04f9485d7da