Device Limit - OneDrive - Configure team site libraries to sync automatically

Is there a plan or workaround to expand the 1000 device limit for the libraries? 

Creating multiple policies for different departments or libraries is not ideal if a user has to access other departments information (since two policies cannot be applied to the same user due to policy conflict).