Merge "Remove unneeded notif vis checks" into tm-dev