Merge "Modify handling of notifs with invalid sounds" into tm-dev