Make DPI groups work again

Change-Id: If39f2347075146a8e39914592a96ca76e07b694a