Merge "Rename mCursorDrawble to mDrawableForCursor"