Merge "Fixing widget notifyDataSetChanged() not getting called, issue 5092676"