Merge "Remove mMessageRejectionCount and related code"