Merge "Deprecate FeedKeyEvent api, add FeedKey api instead"