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

* commit '617a2d7ca7045b7acfb16541ea22a808b5d147c9':
  The heads up now correctly dissapears when clicking