Merge "Update all loader to androidx version loader"