Merge "Fix Error Propagation and No Device Lock" into main