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