Merge "Reduce TogglePermissionAppInfoPageTest flaky" into main