Merge "Change Device List to Device Collection." into idea133