Merge "Fixed a crash with the top headsup entry"