Merge "Fix clipped notifications in sensitive mode" into tm-dev