Merge "Move the people filtering to DeviceConfig flag"