Merge "Remove redundant registerBuffer/unregisterBuffer calls"