Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev