Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev