Merge "Use atomic++ rather than lock/++/unlock in the input dispatch code path"