Merge "Revert^4 "Implement app store filters entry point in Supervision Settings dashboard."" into main