Merge "Make more DeviceHandler member functions private" into main