Merge "Reduce ClientController#mClients visibility scope" into main