Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev