Merge "Fix UnlockedDeviceRequired with weak unlock methods" into main