Merge "DPMS: Replace ArrayList<>(1) with SingletonList"