Merge "Fixed an issue where notification launches were visually broken" into tm-dev