Merge "Add STS annotation to ForegroundModeAndActive test"