Merge "Increase configs per uid limit to 20" into rvc-dev