Merge "lockDevice should actually lock the device" into main