Merge "Remove locks in XfrmController"