Merge "Add view inflation device config property"