Merge "Revert "Use SysUI TAPL on notification tests"" into main