Merge "Make getCellLocation return null if not available."