Merge "The heads up now correctly dissapears when clicking" into mnc-dev