Merge "Revert "Revert "Add view inflation device config property"""