Merge "Turn down dynamic toggle for background restriction policy" into oc-dev