Merge "Address comments with getDeviceIds" into main