Merge "Improve visual interruption decision provider tests" into main