Merge "Fixing issue where notifyDataSetChanged was not properly being called while not loading items."