Merge "Updating new widget api to account for view type count"