Merge "Revert "Eliminate the "productivity_device" setting.""