am 6cb78ad5: am 73168821: am 5b5d9129: am b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev

* commit '6cb78ad542bbe54c6a839c11eca0f47f2d06dd1c':
  The heads up now correctly dissapears when clicking