Merge "Clear calling identity before updating lock-task packages" into main