Merge "Refactor setAppOpVisibility implementation."