Cherry Picking Twitter Widget Changes and Fixing Conflicts