Merge "Add device to to cached device manager if it's not present" into main