Merge "Adding scroll disambiguation between Workspace and AppWidgets" into honeycomb