Merge "Ensure WeeksAdapter calls notifyDataSetChanged when needed" into klp-dev