Merge "Make LockoutResetCallback oneway"